extensions/u32: add ~ model/format support

diff --git a/extensions/u32.c b/extensions/u32.c
index 36923d450246b9824e3441a35c667a3599683240..1f2148f294fac8c41ec7ecd892153ee06b45d4e0 100644 (file)
--- a/extensions/u32.c
+++ b/extensions/u32.c
@@ -203,6 +203,18 @@ init (void)
     "linear",
     conv_rgbu32_rgbu16,
     NULL);
+  babl_conversion_new (
+    babl_format ("R~G~B~A u32"),
+    babl_format ("R~G~B~A u16"),
+    "linear",
+    conv_rgbau32_rgbau16,
+    NULL);
+  babl_conversion_new (
+    babl_format ("R~G~B~ u32"),
+    babl_format ("R~G~B~ u16"),
+    "linear",
+    conv_rgbu32_rgbu16,
+    NULL);
   babl_conversion_new (
     babl_format ("RGB u32"),
     babl_format ("RGB u16"),
@@ -215,6 +227,12 @@ init (void)
     "linear",
     conv_rgbu16_rgbu32,
     NULL);
+  babl_conversion_new (
+    babl_format ("R~G~B~ u16"),
+    babl_format ("R~G~B~ u32"),
+    "linear",
+    conv_rgbu16_rgbu32,
+    NULL);
   babl_conversion_new (
     babl_format ("RGB u16"),
     babl_format ("RGB u32"),
@@ -270,7 +288,18 @@ init (void)
     "linear",
     conv_rgb32_rgba32,
     NULL);
-
+  babl_conversion_new (
+    babl_format ("R~G~B~A u32"),
+    babl_format ("R~G~B~ u32"),
+    "linear",
+    conv_rgba32_rgb32,
+    NULL);
+  babl_conversion_new (
+    babl_format ("R~G~B~ u32"),
+    babl_format ("R~G~B~A u32"),
+    "linear",
+    conv_rgb32_rgba32,
+    NULL);
   babl_conversion_new (
     babl_format ("Y u32"),
     babl_format ("Y u16"),
@@ -283,6 +312,12 @@ init (void)
     "linear",
     conv_u32_u16,
     NULL);
+  babl_conversion_new (
+    babl_format ("Y~ u32"),
+    babl_format ("Y~ u16"),
+    "linear",
+    conv_u32_u16,
+    NULL);
   babl_conversion_new (
     babl_format ("Y u16"),
     babl_format ("Y u32"),
@@ -295,7 +330,12 @@ init (void)
     "linear",
     conv_u16_u32,
     NULL);
-
+  babl_conversion_new (
+    babl_format ("Y~ u16"),
+    babl_format ("Y~ u32"),
+    "linear",
+    conv_u16_u32,
+    NULL);
 
   babl_conversion_new (
     babl_format ("YA u32"),
@@ -315,6 +355,13 @@ init (void)
     "linear",
     conv_yau32_yau16,
     NULL);
+
+  babl_conversion_new (
+    babl_format ("Y~A u32"),
+    babl_format ("Y~A u16"),
+    "linear",
+    conv_yau32_yau16,
+    NULL);
   babl_conversion_new (
     babl_format ("Y'aA u32"),
     babl_format ("Y'aA u16"),
@@ -339,14 +386,19 @@ init (void)
     "linear",
     conv_yau16_yau32,
     NULL);
+
+  babl_conversion_new (
+    babl_format ("Y~A u16"),
+    babl_format ("Y~A u32"),
+    "linear",
+    conv_yau16_yau32,
+    NULL);
   babl_conversion_new (
     babl_format ("Y'aA u16"),
     babl_format ("Y'aA u32"),
     "linear",
     conv_yau16_yau32,
     NULL);
-
-
   babl_conversion_new (
     babl_format ("Y u32"),
     babl_format ("YA u32"),
@@ -365,6 +417,12 @@ init (void)
     "linear",
     conv_yu32_yau32,
     NULL);
+  babl_conversion_new (
+    babl_format ("Y~ u32"),
+    babl_format ("Y~A u32"),
+    "linear",
+    conv_yu32_yau32,
+    NULL);
   babl_conversion_new (
     babl_format ("Y' u32"),
     babl_format ("Y'aA u32"),